From 909e8999f47efeaa1a21eb8afb02def242334276 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Tue, 25 Oct 2022 19:48:46 +0200 Subject: [PATCH] phase1: perform rsync steps only if configured MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 64d350b..424fc9f 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -1027,6 +1027,7 @@ for target in targets: haltOnFailure = True, logEnviron = False, locks = NetLockUl, + doStepIf = util.Transform(bool, GetRsyncParams.withArgs("bin", "url")), )) # download remote sha256sums to 'target-sha256sums' @@ -1040,6 +1041,7 @@ for target in targets: haltOnFailure = False, flunkOnFailure = False, warnOnFailure = False, + doStepIf = util.Transform(bool, GetRsyncParams.withArgs("bin", "url")), )) # build list of files to upload @@ -1076,6 +1078,7 @@ for target in targets: env={ 'RSYNC_PASSWORD': Interpolate("%(kw:key)s", key=GetRsyncParams.withArgs("bin", "key")) }, haltOnFailure = True, logEnviron = False, + doStepIf = util.Transform(bool, GetRsyncParams.withArgs("bin", "url")), )) # delete files which don't exist locally @@ -1090,6 +1093,7 @@ for target in targets: haltOnFailure = True, logEnviron = False, locks = NetLockUl, + doStepIf = util.Transform(bool, GetRsyncParams.withArgs("bin", "url")), )) factory.addStep(ShellCommand( @@ -1103,7 +1107,7 @@ for target in targets: haltOnFailure = True, logEnviron = False, locks = NetLockUl, - doStepIf = IsKmodArchiveEnabled, + doStepIf = util.Transform(lambda a, b: bool(a and b), IsKmodArchiveEnabled, GetRsyncParams.withArgs("bin", "url")), )) factory.addStep(ShellCommand( @@ -1124,6 +1128,7 @@ for target in targets: haltOnFailure = True, logEnviron = False, locks = NetLockUl, + doStepIf = util.Transform(bool, GetRsyncParams.withArgs("src", "url")), )) factory.addStep(ShellCommand( -- 2.30.2